From 9d6954734dc70551583c2c96802bc7379627d188 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasne@redhat.com>
Date: Tue, 12 Feb 2008 22:43:35 +0000
Subject: [PATCH] Fix some i18n errors. Pointed out by Behdad Esfahbod.

2008-02-12  Matthias Clasen  <mclasne@redhat.com>

        * gtk/gtkpapersize.c:
        * gtk/gtkprintoperation.c:
        * gtk/gtkvolumebutton.c:
        * gtk/gtkbulderparser.c: Fix some i18n errors. Pointed
        out by Behdad Esfahbod.



svn path=/trunk/; revision=19547
---
 ChangeLog               |  8 ++++++++
 gtk/gtkbuilderparser.c  | 12 ++++--------
 gtk/gtkpapersize.c      |  2 +-
 gtk/gtkprintoperation.c |  3 +--
 gtk/gtkvolumebutton.c   |  2 +-
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a701abe995..0d4ba3d529 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-02-12  Matthias Clasen  <mclasne@redhat.com>
+
+	* gtk/gtkpapersize.c:
+	* gtk/gtkprintoperation.c:
+	* gtk/gtkvolumebutton.c:
+	* gtk/gtkbulderparser.c: Fix some i18n errors. Pointed
+	out by Behdad Esfahbod.
+
 2008-02-12  Federico Mena Quintero  <federico@novell.com>
 
 	Merged from gtk-2-12:
diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index db37467233..ded89e316f 100644
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -18,24 +18,20 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
+
 #include <string.h>
-#include <glib/gfileutils.h>
-#include <glib/gi18n.h>
-#include <glib/gmacros.h>
-#include <glib/gmessages.h>
-#include <glib/gslist.h>
-#include <glib/gstrfuncs.h>
-#include <glib-object.h>
 #include <gmodule.h>
 
 #include <gdk/gdkenumtypes.h>
 #include <gdk/gdkkeys.h>
-#include <gtk/gtktypeutils.h>
+#include "gtktypeutils.h"
 #include "gtkbuilderprivate.h"
 #include "gtkbuilder.h"
 #include "gtkbuildable.h"
 #include "gtkdebug.h"
 #include "gtktypeutils.h"
+#include "gtkintl.h"
 #include "gtkalias.h"
 
 static void free_property_info (PropertyInfo *info);
diff --git a/gtk/gtkpapersize.c b/gtk/gtkpapersize.c
index 8db4a2873a..b53768c7a6 100644
--- a/gtk/gtkpapersize.c
+++ b/gtk/gtkpapersize.c
@@ -525,7 +525,7 @@ gtk_paper_size_get_display_name (GtkPaperSize *size)
   g_assert (size->info != NULL);
 
   display_name = paper_names + size->info->display_name;
-  return g_strip_context (display_name, gettext (display_name));
+  return g_strip_context (display_name, _(display_name));
 }
 
 /**
diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index 14b3a6a762..3b7bff403d 100644
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -1518,8 +1518,7 @@ _gtk_print_operation_set_status (GtkPrintOperation *op,
     status = GTK_PRINT_STATUS_FINISHED_ABORTED;
 
   if (string == NULL)
-    string = g_strip_context (status_strs[status],
-			      gettext (status_strs[status]));
+    string = g_strip_context (status_strs[status], _(status_strs[status]));
   
   if (priv->status == status &&
       strcmp (string, priv->status_string) == 0)
diff --git a/gtk/gtkvolumebutton.c b/gtk/gtkvolumebutton.c
index 68523eb704..ac22b8a4be 100644
--- a/gtk/gtkvolumebutton.c
+++ b/gtk/gtkvolumebutton.c
@@ -29,12 +29,12 @@
 
 #include <config.h>
 
-#include <glib/gi18n.h>
 #include <atk/atk.h>
 
 #include "gtkvolumebutton.h"
 #include "gtkstock.h"
 #include "gtktooltip.h"
+#include "gtkintl.h"
 
 #include "gtkalias.h"
 
-- 
2.30.2